Several updates
Merge pull request #168 from krasserm/patch-14

Several project updates