Merge pull request #1 from rodrev/master

version 1.1 - some bug fixes