Fixed nullpointerexception problem
Merge remote-tracking branch 'origin/master'
Updated gitignore. Added Eclipse project file.
Updated README file.
Updated history file.