Refactoring and extending functionality
Merge branch 'master' of http://github.com/bjornandersson/punch