bug with last commit
Merge pull request #16 from andrewbackes/dev

bug with last commit