Updated Interface

Work in progress, will do more tonight and tomorrow.
Merge pull request #18 from mierze/master

Updated Interface