ui finished? waiting for input
Merge pull request #18 from littlpunk/master

ui finished? waiting for input