Merge pull request #18 from akloeckner/master

Removed dependencies on external libraries