UNCLASSIFIED
Fixes #5 (closed) and brings code up to date with the patches earlier applied by @balexand
@alfontaine
