Merge pull request #13 from mariokonrad/master

Pulled to resolve issues #11 and #12