Merge pull request #7 from thebirn/master

pull
Merge pull request #9 from thebirn/pre_master

Merge pull request #7 from thebirn/master
Merge pull request #10 from thebirn/master

pull2