Merged dev branch, where issue #16 was fixed; tagged v1.0