Merge pull request #196 from andylyall/2014.05

2014.05
Fix bad copy from branch