Merge Code and View
Merge pull request #1 from rdd7/master

Merge Code and View