master has some changes
adding to funk branch
Merge branch 'funk' of https://github.com/javaseeds/Spoon-Knife into funk