Merge pull request #14 from Zookal/master

Fixing Issues #11 #12