Issue #16 fix candidate - Add seamless loop otion

This fix has been discussed and tested on the Issue #16 thread.
It only addresses this specific issue/feature. Might not be the best implementation but should not be too intrusive and is pretty seamless.