committing oct22-2014
Merge branch 'master' of https://github.com/themagpimag/magpi-issue28