Fix #15

* Fix for #15 plus test case (ByteContainerTest.java)
* Cleans up the whitespace isses from #46