Master #461 merge of 1.0 (bugfixes)

Merging of `1.0` branch into `master` branch (24-oct-2014 at 17:15 CEST), according to #461.