Merge branch 'production'
Merge branch 'production' into dev
Joined 2 tests into 1 'describe'
Added basic search, Closes #2