Updated to 0.1.42
Merge branch 'master' of https://github.com/conmarap/conmarap.github.com
Updated to 0.1.42