Merge pull request #8 from rcquan/dev

added new ideas"
Merge remote-tracking branch 'upstream/dev' into dev