Merged #25 from rougin:patch-1