added input from SQL
Merge branch 'master' of https://github.com/rcockbur/project