some new changes
iMerge branch 'master' of https://github.com/dr42/dr42.github.io