Merge pull request #1 from idealconceptz/feature/100

finished 100
Merge pull request #2 from idealconceptz/feature/200

200