broke so many things ... fixed maybe?
Merge pull request #63 from thequbit/master

broke so many things ... fixed maybe?