Master #500 merge of 1.0 (bugfixes)

Merging of `1.0` branch into `master` branch (11-dec-2014 at 12:00 CEST), according to #500.