Fixed issue #6 by using Bundle and newInstance