really huge update
Merge pull request #84 from bhimasta/baru

 really huge update