Changed to more integrated version style.
Use my fork to make sure it stay intact.
Add tiny exception test.