Updated documentation, added option parsing