Rewritten to be more flexible

Fixes #3 (closed), #4 (closed), #5 (closed)

added 2 commits

• 1683eaab - 1 commit from branch master
• b9ea2f26 - Rewritten to be more flexible

Compare with previous version

merged