Merge pull request #74 from alexsn/master