Delete obsolete file
Merge pull request #14 from zoid/devel

Merge devel to master