pre-merge
Merge branch 'master' of github.com:ndkane/ndkane.com
Fixed merge