Wed 6th Nov 2013
Merge 'development-branch' for up to koan 105