Master #452 merge of 1.0 (bugfixes)

Merging of `1.0` branch into `master` branch (13-oct-2014 at 18:30 CEST), according to #452.