Updated to version 0.3

Added more thorough searching and bug fixes.