Merge pull request #11 from renuo/master

bugfix