tweaks
Merge pull request #26 from nuclearace/master

tweaks