This closes #83
Added contextPath
Merge branch 'master', remote-tracking branch 'upstream/master'