committed: v0.1.2014-03-03

+ improved: error handling