Fixed bugs before standup
Merge pull request #10 from inoda/fixedstuff

Fixed bugs before standup