Fix for Issue 12 and Issue 14

This should fix: https://github.com/TheCricket/Chisel-2/issues/62