Initial Sync
update 4-9-14
update 4-14-14
Merge branch 'master' into gh-pages