Merge pull request #4 from bpotterschipul/master

Eliminating lines of code for simplicity
Merge remote-tracking branch 'upstream/master'