Update 28/04/14

This is a sync of the fork with changes made to original since repo was forked.