Initial commit
Merge http://github.com/PieterD/flarg