Merge branch 'master' into #5/refactor

Conflicts:
	src/main/java/pl/bgora/rpn/FunctionsCalculator.java

.gitignore

@@ -215,4 +215,6 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 
-target/
+target/
+.idea
+*.iml

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>pl.bgora</groupId>
 	<artifactId>RPNLibrary</artifactId>
-	<version>2.0</version>
+	<version>2.0.1</version>
 	<name>RPNLibrary</name>
 	<description>RPN Libray for Java.</description>
 	<build>

src/test/java/pl/bgora/CalculatorTest.java

@@ -93,6 +93,12 @@ public void testSinus() throws RPNException {
         assertEquals(BigDecimal.valueOf(Math.sin(2)), result);
     }
 
+    @Test
+    public void testOneAddWhiteSpaceSinus() throws RPNException {
+        BigDecimal result = calc.calculate("1 + sin(2)");
+        assertEquals(BigDecimal.valueOf(1+Math.sin(2)), result);
+    }
+
     @Test
     public void testSinusPlus() throws RPNException {
         BigDecimal result = calc.calculate("sin(1+1)");
@@ -129,6 +135,12 @@ public void testCtgMinus5Zeros() throws RPNException {
         assertEquals(BigDecimal.valueOf(1.00 / Math.tan(-1.65091)), result);
     }
 
+    @Test
+    public void testAddTousands() throws RPNException {
+        BigDecimal result = calc.calculate("12 000 + 15");
+        assertEquals(BigDecimal.valueOf(12015), result);
+    }
+
     @Test(expected = RPNException.class)
     public void shouldThrowRPNException() throws RPNException {
         calc.calculate("aaaaa");