Merge pull request #7 from markableidinger/working

Trying to make these branches work
Merge pull request #12 from markableidinger/master

Merge pull request #7 from markableidinger/working