Merge pull request #30 from Drewzar/master

what what in the plusplus