Merge pull request #14 from insom/master