Merge pull request #31 from TobyPalmer/felicia

Merged felicia into master
bug fix
merging