branched so i can keep working on my code
Merge pull request #4 from kraftman/gah

branched so i can keep working on my code