Cleaned up help/arguments
Increased version number
Merged