Commit 3e4425d98cdc087300f424e6998efe320aa0a03f

Con Kolivas 2014-01-09T16:20:18

Merge branch 'nanofury'