0.1.1
Started refactor and adding options