Merge pull request #5 from Rebolon/nikoniko

Main refactoring previous to add new nikoniko feature
Merge branch 'master' of http://github.com/Rebolon/MeetingTimeCost into nikoniko
Merge branch 'nikoniko' of http://github.com/Rebolon/MeetingTimeCost into nikoniko
correction for streams