1.0
Merge remote-tracking branch 'alexanderma/master'