Resolves issues #95 & #96.
Merge branch 'master' into dev