Fix bug that causes options replacement
Merge pull request #6 from killthekitten/fix-options-replacement

Fix bug that causes options replacement