issue #1 and issue #2 is done now.
Merge branch 'master' of https://github.com/makaveli713/ECEC