Fixes
Merge pull request #5 from chemikpil/2014

Fixes