Merge pull request #14 from johns996/master

synch dev branch with master changes
Merge pull request #15 from johns996/master

Sync branches
tweak for searchbox hiding bug
Merge pull request #16 from johns996/dev-eric

Dev eric