Solving the issue #49

@joe-linden