Fix for #3 and dependency cleanup
Merge remote-tracking branch 'origin/master'